Revision: bazaar--devel--1.1--patch-66
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Jan 11 13:43:42 EST 2005
Standard-date: 2005-01-11 02:43:42 GMT
Modified-files: libarch/merge.c
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-66
Summary: change references to star-merge to merge in the UI, closes: #5284
Keywords: 

